Merged from trunk
authorJason Rumney <jasonr@gnu.org>
Sun, 10 Jan 2010 14:34:14 +0000 (22:34 +0800)
committerJason Rumney <jasonr@gnu.org>
Sun, 10 Jan 2010 14:34:14 +0000 (22:34 +0800)
commitff9549aa572e254e7d2cb70960da6aa91b14d2bb
tree7399c7e22e325cce6cec086288c3998957b082e4
parent1c72f59caf64e3d8a280fb2e47e5167582778528
parent47c6f190784ead31c4b4e0cc1edb96569b52027e
Merged from trunk